Translate more OpenTelemetry resource conventions #4955
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Translate more OpenTelemetry resource conventions, focusing on common conventions ones which already have a clear mapping to our data model. Add fields to metadata model types for missing ECS fields.
axw
force-pushed
the
otel-resource-conventions
branch
from
cf62e63 to
bdaebf3
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
Update modeldecodertest.SetStructValues with options which enable a caller to override the value to which a field is set. This is used to initialise fields which have no equivalent in the input model.
axw
commented
Mar 15, 2021
Comment on lines
-38
to
-49
| "hostname": System{DetectedHostname: detected}, | ||
| "ignored hostname": System{ConfiguredHostname: configured}, | ||
| "full hostname info": System{DetectedHostname: detected, ConfiguredHostname: configured}, | ||
| "k8s nodename with hostname": System{Kubernetes: Kubernetes{NodeName: nodename}, DetectedHostname: detected}, | ||
| "k8s nodename with configured hostname": System{Kubernetes: Kubernetes{NodeName: nodename}, ConfiguredHostname: configured}, | ||
| "k8s podname": System{Kubernetes: Kubernetes{PodName: podname}, DetectedHostname: detected}, | ||
| "k8s podUID": System{Kubernetes: Kubernetes{PodUID: podUID}, DetectedHostname: detected}, | ||
| "k8s namespace": System{Kubernetes: Kubernetes{Namespace: namespace}, DetectedHostname: detected}, | ||
| "k8s podname with configured hostname": System{Kubernetes: Kubernetes{PodName: podname}, DetectedHostname: detected, ConfiguredHostname: configured}, | ||
| "k8s podUID with configured hostname": System{Kubernetes: Kubernetes{PodUID: podUID}, DetectedHostname: detected, ConfiguredHostname: configured}, | ||
| "k8s namespace with configured hostname": System{Kubernetes: Kubernetes{Namespace: namespace}, DetectedHostname: detected, ConfiguredHostname: configured}, | ||
| "k8s empty": System{Kubernetes: Kubernetes{}, DetectedHostname: detected, ConfiguredHostname: configured}, |
There was a problem hiding this comment.
Kubernetes is generally covered by kubernetes_test.go, and the logic for setting host.hostname for events with kubernetes metadata is covered by the modeprocessor. The tests are redundant now.
Codecov Report
@@ Coverage Diff @@
## master #4955 +/- ##
==========================================
+ Coverage 76.98% 77.21% +0.22%
==========================================
Files 175 175
Lines 10354 10413 +59
==========================================
+ Hits 7971 8040 +69
+ Misses 2383 2373 -10
|
axw
added a commit
to axw/apm-server
that referenced
this pull request
Mar 29, 2021
* Translate more OpenTelemetry resource conventions Translate more OpenTelemetry resource conventions, focusing on common conventions ones which already have a clear mapping to our data model. Add fields to metadata model types for missing ECS fields. * model/modeldecoder: fix tests due to added fields Update modeldecodertest.SetStructValues with options which enable a caller to override the value to which a field is set. This is used to initialise fields which have no equivalent in the input model. # Conflicts: # changelogs/head.asciidoc
axw
added a commit
that referenced
this pull request
Mar 29, 2021
* Translate more OpenTelemetry resource conventions Translate more OpenTelemetry resource conventions, focusing on common conventions ones which already have a clear mapping to our data model. Add fields to metadata model types for missing ECS fields. * model/modeldecoder: fix tests due to added fields Update modeldecodertest.SetStructValues with options which enable a caller to override the value to which a field is set. This is used to initialise fields which have no equivalent in the input model. # Conflicts: # changelogs/head.asciidoc
|
Tested with BC 4 - looks good. Different labels were indexed: |
mergify bot
pushed a commit
that referenced
this pull request
May 12, 2021
* Translate more OpenTelemetry resource conventions Translate more OpenTelemetry resource conventions, focusing on common conventions ones which already have a clear mapping to our data model. Add fields to metadata model types for missing ECS fields. * model/modeldecoder: fix tests due to added fields Update modeldecodertest.SetStructValues with options which enable a caller to override the value to which a field is set. This is used to initialise fields which have no equivalent in the input model. (cherry picked from commit 1b1e79d) # Conflicts: # changelogs/head.asciidoc # model/modeldecoder/v2/metadata_test.go
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
Translate more OpenTelemetry resource conventions, focusing on common conventions which already have a clear mapping to our data model. Add fields to metadata model types for missing ECS fields.
Checklist
How to test these changes
Related issues
#4714